diff --git a/templates/base.html b/templates/base.html
index 6a137ef..79a6a3e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -24,7 +24,9 @@
   {% block head %}
   {% endblock %}
 
-  <title>{% block title %}{{ SITENAME }}{% endblock %}</title>
+  <title>
+    {% block title %}{{ SITENAME }}{% endblock %}
+  </title>
 
   {% include "analytics.html" %}
 </head>
@@ -39,17 +41,15 @@
         <img src="{{ SITEURL }}/theme/images/logo.png" alt="logo">
         {% endif %}
       </a>
-      <h1><a href="{{ SITEURL }}">{{ AUTHOR }}</a></h1>
+      <h2><a href="{{ SITEURL }}">{{ AUTHOR }}</a></h2>
       <p>{{ TAGLINE }}</p>
       <ul>
         {% for title, link in MENUITEMS %}
         <li><a href="{{ link }}">{{ title }}</a></li>
         {% endfor %}
-        {% if DISPLAY_PAGES_ON_MENU %}
-        {% for p in pages %}
-        <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
-        {% endfor %}
-        {% endif %}
+        {% if DISPLAY_PAGES_ON_MENU %}{% for p in pages %}
+        <li><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
+        {% endfor %}{% endif %}
         {% for name, link in LINKS %}
         <li><a href="{{ link }}" target="_blank">{{ name }}</a></li>
         {% endfor %}
@@ -62,17 +62,17 @@
 
   <main>
     <header>
+      {% block header %}
       <p>
-        {% block header %}
-        <a href="{{ SITEURL }}">Index</a> &#124; <a href="{{ SITEURL }}/archives.html">Archives</a>
-        {% if FEED_ALL_ATOM %}
-        &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Atom Feed</a>
-        {% endif %}
-        {% if FEED_ALL_RSS %}
-        &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">RSS Feed</a>
-        {% endif %}
-        {% endblock header %}
+      <a href="{{ SITEURL }}">Index</a> &#124; <a href="{{ SITEURL }}/archives.html">Archives</a>
+      {% if FEED_ALL_ATOM %}
+      &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Atom Feed</a>
+      {% endif %}
+      {% if FEED_ALL_RSS %}
+      &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">RSS Feed</a>
+      {% endif %}
       </p>
+      {% endblock header %}
     </header>
 
     {% block content %}
@@ -84,7 +84,7 @@
     </footer>
 
     <div id="ending_message">
-      <p>&copy Giulio Fidente. Built using <a href="http://getpelican.com" target="_blank">Pelican</a>. Fork the blog theme <a href="https://github.com/giulivo/pelican-svbhack" target="_blank">on github</a>.</p>
+      <p>&copy Giulio Fidente. Built using <a href="http://getpelican.com" target="_blank">Pelican</a>. You can fork the theme on <a href="https://github.com/giulivo/pelican-svbhack" target="_blank">github</a>.</p>
     </div>
   </main>
 </body>